From 2b9d6319c364fdb633228787d40e19443a689061 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sat, 18 Aug 2012 12:01:01 -0700 Subject: [PATCH] Added --quick option to file test script to use doQuickOperations. Change-Id: Iae754bac5190db8fe447663cb8cf0e3478511abf --- maintenance/fileOpPerfTest.php | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/maintenance/fileOpPerfTest.php b/maintenance/fileOpPerfTest.php index 69a2a7824b..0f73e880ac 100644 --- a/maintenance/fileOpPerfTest.php +++ b/maintenance/fileOpPerfTest.php @@ -40,6 +40,7 @@ class TestFileOpPerformance extends Maintenance { $this->addOption( 'b2', 'Backend 2', false, true ); $this->addOption( 'srcdir', 'File source directory', true, true ); $this->addOption( 'maxfiles', 'Max files', false, true ); + $this->addOption( 'quick', 'Avoid operation pre-checks' ); } public function execute() { @@ -76,11 +77,14 @@ class TestFileOpPerformance extends Maintenance { if ( $file[0] != '.' ) { $this->output( "Using '$dirname/$file' in operations.\n" ); $dst = $baseDir . '/' . wfBaseName( $file ); - $ops1[] = array( 'op' => 'store', 'src' => "$dirname/$file", 'dst' => $dst, 'overwrite' => 1); - $ops2[] = array( 'op' => 'copy', 'src' => "$dst", 'dst' => "$dst-1", 'overwrite' => 1); - $ops3[] = array( 'op' => 'move', 'src' => $dst, 'dst' => "$dst-2", 'overwrite' => 1); - $ops4[] = array( 'op' => 'delete', 'src' => "$dst-1", 'overwrite' => 1 ); - $ops5[] = array( 'op' => 'delete', 'src' => "$dst-2", 'overwrite' => 1 ); + $ops1[] = array( 'op' => 'store', + 'src' => "$dirname/$file", 'dst' => $dst, 'overwrite' => 1); + $ops2[] = array( 'op' => 'copy', + 'src' => "$dst", 'dst' => "$dst-1", 'overwrite' => 1 ); + $ops3[] = array( 'op' => 'move', + 'src' => $dst, 'dst' => "$dst-2", 'overwrite' => 1 ); + $ops4[] = array( 'op' => 'delete', 'src' => "$dst-1" ); + $ops5[] = array( 'op' => 'delete', 'src' => "$dst-2" ); } if ( count( $ops1 ) >= $this->getOption( 'maxfiles', 20 ) ) { break; // enough @@ -89,8 +93,10 @@ class TestFileOpPerformance extends Maintenance { closedir( $dir ); $this->output( "\n" ); + $method = $this->hasOption( 'quick' ) ? 'doQuickOperations' : 'doOperations'; + $start = microtime( true ); - $status = $backend->doOperations( $ops1, array( 'force' => 1 ) ); + $status = $backend->$method( $ops1, array( 'force' => 1 ) ); $e = ( microtime( true ) - $start ) * 1000; if ( $status->getErrorsArray() ) { print_r( $status->getErrorsArray() ); @@ -99,7 +105,7 @@ class TestFileOpPerformance extends Maintenance { $this->output( $backend->getName() . ": Stored " . count( $ops1 ) . " files in $e ms.\n" ); $start = microtime( true ); - $backend->doOperations( $ops2, array( 'force' => 1 ) ); + $backend->$method( $ops2, array( 'force' => 1 ) ); $e = ( microtime( true ) - $start ) * 1000; if ( $status->getErrorsArray() ) { print_r( $status->getErrorsArray() ); @@ -108,7 +114,7 @@ class TestFileOpPerformance extends Maintenance { $this->output( $backend->getName() . ": Copied " . count( $ops2 ) . " files in $e ms.\n" ); $start = microtime( true ); - $backend->doOperations( $ops3, array( 'force' => 1 ) ); + $backend->$method( $ops3, array( 'force' => 1 ) ); $e = ( microtime( true ) - $start ) * 1000; if ( $status->getErrorsArray() ) { print_r( $status->getErrorsArray() ); @@ -117,7 +123,7 @@ class TestFileOpPerformance extends Maintenance { $this->output( $backend->getName() . ": Moved " . count( $ops3 ) . " files in $e ms.\n" ); $start = microtime( true ); - $backend->doOperations( $ops4, array( 'force' => 1 ) ); + $backend->$method( $ops4, array( 'force' => 1 ) ); $e = ( microtime( true ) - $start ) * 1000; if ( $status->getErrorsArray() ) { print_r( $status->getErrorsArray() ); @@ -126,7 +132,7 @@ class TestFileOpPerformance extends Maintenance { $this->output( $backend->getName() . ": Deleted " . count( $ops4 ) . " files in $e ms.\n" ); $start = microtime( true ); - $backend->doOperations( $ops5, array( 'force' => 1 ) ); + $backend->$method( $ops5, array( 'force' => 1 ) ); $e = ( microtime( true ) - $start ) * 1000; if ( $status->getErrorsArray() ) { print_r( $status->getErrorsArray() ); -- 2.20.1